From: Jo-Philipp Wich Date: Fri, 3 Jun 2022 11:36:02 +0000 (+0200) Subject: luci-app-opkg: fix parsing package dependencies with version constraints X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=1cf976c2b3faa28f7416f11babbb9128dff29520;p=project%2Fluci.git luci-app-opkg: fix parsing package dependencies with version constraints Due to improper ordering of regexp alternatives, version constraint operators might get undermatched. Fixes: https://github.com/openwrt/openwrt/issues/9982 Signed-off-by: Jo-Philipp Wich (cherry picked from commit b84791bd029c2aaa67cbc06a15d23828f62f4608) --- diff --git a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js index 69b69be9b9..a019b2cc31 100644 --- a/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js +++ b/applications/luci-app-opkg/htdocs/luci-static/resources/view/opkg.js @@ -571,7 +571,7 @@ function renderDependencies(depends, info) if (deps[i] === 'libc') continue; - if (deps[i].match(/^(.+)\s+\((<=|<|>|>=|=|<<|>>)(.+)\)$/)) { + if (deps[i].match(/^(.+)\s+\((<=|>=|<<|>>|<|>|=)(.+)\)$/)) { dep = RegExp.$1.trim(); vop = RegExp.$2.trim(); ver = RegExp.$3.trim();